commit: Merge my change of 2008-05-14 to the query-coding-region code.