[BUG #7758] Moved some privates to protected for better extensibility.