Minor cleanup of some code added while debugging the last issue.