GR-30, types update rules

Not for merge, just comments
I think rubocop may have complained about line length, but more likely it was me hating redundancy.