Typehint BuilderAbstract, update docblocks, rename vars