Merge JeffT's update to structure decoder.