cleaned up some code and moved some not-entirely-satisfying parser code into
library...
broke split out from _pack caller...
Merge branch 'release/2013092401'