Some refactoring of access checks - in progress.