Lots of cleanup. Builder variables aren't copied, but used through the Builder instance instead.