Forgot to commit these cleanups it seems.
 -Erik
16 files changed