Merge "Small refactoring of field/method access checks."