Switch to representation of types discussed with @deadfoxygrandpa