Polishing

This change polishes up the application a little bit.  It stops
explicitly defining a dependency that comes automatically, and
simplifies the signatures of a couple of methods.