Improved constant pool indexing