Remaining changes in LSP/OCP.