Fix bug #1108 by always canonicalizing arguments.
2 files changed