GR 42 - restrict fields

@twinge, please review
Minor nitpick, there should only be 1 space after the `true`. I'd be fine with standardizing on 2 spaces before an inline comment, but I feel pretty strongly about the 1 space between `true` and `while`