Clean: Clarify and simplify save and buld logic.