Use better distinguisher strings.
Use double-HMAC string compare, check return values.