Made additional bug-fix changes as noted in comments previously, however while I'm fairly certain the changes are correct, not as sure about how to test. I kind of wonder if changing the USING clause even needs to be supported.
Merge branch 'bug-fix'

* bug-fix:
  Made additional bug-fix changes as noted in comments previously, however while I'm fairly certain the changes are correct, not as sure about how to test. I kind of wonder if changing the USING clause even needs to be supported.