More Type Enforcement, Remove some TODOs