iorg--nil-and-t-to-uppercase simplified.