Fixed the missing iPhone macros
Reduced the complexity of some of the binary operations