package cleanup and promotion
[git-p4: depot-paths = "//usr/ryand/Bin/elisp/": change = 9252]