old changes from 2006-03-25 16:07 to support alternative code-ref parametars for