Work-in-progress commit of Option data types.