Minor scaffolding cleanup and version bump.