extract statement-rebuilder logic to its own class
convert $bind tracking to use rebuilder properties, etc.