Minor style cleanups

Remove some commented-out code and use `fromMaybe` instead
of `maybe x id m`