Replace inefficient new Long(long) constructor to silence FindBugs