Better <key> escaping