GR 42 - restrict fields

@twinge, please review
This elseif and the one below it both do the same thing. Looks like they could be combined.