Version bump and code cleanups.