GR 42 - restrict fields

@twinge, please review
I see later it makes the code a bit cleaner.