Fixed: Eliminated a few UnknownTypes and made use of NoneDefinition instead.