A little more cleanup.  Group instruction patterns more logically.  Add tests for integer equality and return.