WYIL: bug fix for #295
Minor tweaks to remove debugging code.