Shorter relkind
Tweak comments
Fix remaining reasonable regression failures