Improve detection of incorrect usage.