Add thisEnclosingJoinPointStaticPart to AjUnitAspectBase. Add LogicalPredicate interface. Split TransformerPredicate into two classes SimpleTransformerPredicate and DelegatingTransformerPredicate.