Fixing up support for multiinstance and friends.