Added @thedrow for cleanups in #677.  Thanks!