These were commented out because Issue #349 was driving me nuts.  I plan to un-comment them before final review of this branch, but, we should really look into that issue.