Add more abbreviations to init-envs.

Make List: matcher require being a Type.