Cleaned up OCP code a bit to have less differences with the LSP/ISP code.  Trying to keep code as uniform as possible across the principles.