I understand that it's a cumbersome logic to start with, but I rather have a refactor in this small class to hide the eclipse-ish style, unless you think the "near full reimplementation" is actually near.