replace alias_methods with real ones (fixes 1.8.7/ree)
only extend with IdentityMapQueryMethods if IdentityMap is enabled