Change Modifiers to be a record-style struct

This should mitigate potential PEBKACs caused due to accidental derefs