CP-13 Removed some explicit type declarations.