Added @jsummerfield for cleanups in #824. Thanks!