misc::maintenance: clean-up

* Various small code style fixes.
* Remove unnecessary layer of indirection added by '$enabled' param, which
  needs to be converted to an $ensure param.

Change-Id: I96c2025146aa91dfae5716a67b176f711e3f4f54