Replace 'if_platform' and 'unless_platform' with 'platform'
Switch some more tests to use the new helpers
Convert remaining *_range_field's to *_num_field
Remove unused helper functions