Use NSNumber numberWithInteger: instead of NSNumber numberWithInt: where appropriate

The "meat" of this PR is the two lines changed from [NSNumber numberWithInt:] which were called with an NSInteger to the appropriate method, getting rid of compiler warnings. Unfortunately (?) my editor was also set to remove trailing whitespace at the end of lines, which makes for quite a few more lines that were technically changed, but not touched functionality wise.