Improve diagnostic per Richard's suggestion
(which may yet change if we move the diagnostic
 outside case value).