Fix: Rewrite and clarify logic behind build/save-and-build.