Minor cleanup for extensibility, version bump