Issue #1831: Add a test
Fix #1831
Fix tests for removal of operator-style invocations.