Code cleanup from last patch, also, version bump for same. :-)