WYIL: removed some debugging code related to previous fix, and added a FIXME.