More refactoring around ParameterContext. Prepping for type annotations.