Fixed #390; trying to trim forward-ref implementation slightly to remove non-static inner classes