Enabling changes for r56828: some refactoring and code cleanup of the protection...