Replace get-optional with :optional where possible.

No functionality change.
Merge pull request #26 from rui314/optional

Replace get-optional with :optional where possible