Slightly better code generation for options
Fix option-getorelse.check