#1 fix little logic leak
#2 annotate constant pool stuff with codec stuff
#1 fix some more logic, with proper test case