Fewer, more precise error messages for datatype mismatch

Per RAZOR-144: This adds two tests and improves the wording of two error messages when a matcher expression expects a different datatype than can be provided.