Couple small cleanups, and implementation of the --titrate_only option.

The last 2 commits can be combined into one, if you feel that would create cleaner history.