Windup 102: Refactor java legacy rules

Excellent :) Much cleaner.