Improved use of Option type in semantics