Merge JeffT's update to structore decoder. Does not publish to a new version yet.