I'm curious to see that you reverted the version-specific checks. Is there no difference between versions? How can both instances and their mock views be present in the hierarchy? (It'd be nice to describe whatever the answer is in a comment in the source.)