Refactoring of bundle-locating code (REnamer, 2425af5)

Move bundle-locating code up to the top of the file, along with the other utility functions. Actually use the new code in more places.

Signed-off-by: Greg Hurrell <greg@hurrell.net>