I pushed the fix to master. Thanks to York and Tom for all the help. I ran ``make test before pushing''. There were two failures, I believe unrelated to this patch:
,---- | Ran 481 tests, 479 results as expected, 2 unexpected (2013-11-27 09:20:58-0500) | 4 expected failures | | 2 unexpected results: | FAILED test-ob/catches-all-references | FAILED test-org-element/link-parser `---- -- Nick