R.typeof now R.type, removed ES3 branching, more tests