GR 42 - restrict fields

@twinge, please review
This actually retains existing behavior, just renaming the variable. See former line 138.