Minor cleanups: logging, enummap, static class