Separate build and bundle.
Simplify handling of errors and returns.