This is as a precursor to switching to using the proper table lookups, which I hope will automatically fix my range issues.