Minor changes to get taggedTypes compiling in intelliJ.