Refactor V20Builder and V21Builder to be private classes.