Cleanly separate build sections