Refactored the javassist bits. This cleaned up some of the method wrapping significantly and allowed the icky SpanHelper static method to be tossed in the garbage.