Remove USE_NATIVE... flag; hide native types for tests instead
Style cleanup