FIX: Cleaner conditionals

@lcampagn this was my attempt to fix the Py3k drawing by making several conditionals more explicit, but it did not work. But it might be useful to have this anyway, to prevent possible future sneaky issues.