In Penknife, simplified some of the `if` macro code.