Got rid of more code-smelly matches against Option types.
Version 1.0.2