Strict checking for the content type.
Removed overly aggressive check.
Stabilised matches to use integer-big-unsigned.