Restore to simple instance variable accessor

Simpler, and disabling the Rubocop rule we don't want that caused it.