#469 Minimize untyped null usage