Task #31: XTuple - prerequisite refactorings.