Emit defs on scoped singleton subjects correctly
Fix edge case for postcontroll detection
Add support for more defs subject edge cases

With defensive default.