Add tests and fix trivia associated with rewritten "dynamic" type syntaxes