Always include the location, unless for setup. Partially undoes e4bb7a7603847164866106c994cff9deb257a1ca.
Merge branch 'location-on-noderefs' of github.com:toad/fred-staging into next