Fix another &lt;

Yes, I know I said I should be using markdown like 20 commits ago.
Refactor to use type cast between numbers in some other places
Adding some more caveats