Code formatting
Also allow java.lang.Long as keys for Maps