Some refactoring in preparation for UNION in Ronja