Remove support for <type>-notation. Update tests.