Tweak to avoid pointless use of a non-static inner class