Windup 102: Refactor java legacy rules

Ah :) Okay! Sorry. Didn't see that.