minor code cleanup, to remove a work-around that was needed pre-JDK-1.6