Fix module name, and remove some wheel-reinvention.
(Oppan) applicative style!