a3f05d0d98
and migrate affected code _last refactoring bits to replace **util.OptionalBool** with **optional.Option[bool]**_