Adding in nullable types for option primitives.