BUG-7464: improve keySet()/entrySet() bytecode