Implicit subject fixes

This fixed #1240.  I still need to add deprecations to 2.99 for the behavioral changes made by this so we should hold off merging until that's ready -- but this is ready for review otherwise.