Fix typo
Eliminate a few more #ifs