Minor reorganizations and cleanup while running initial provisioning tests.