minor cleanup, to eliminate one compiler-generated inner class