yeah, pretty much this. which i think also explains (in part) why dumbledore didn't do anything about the horcruxes before. i think he knew of them long before HBP, but voldy was bodyless for a long time...