Fix spurious redefinition warnings in conditionals. Patch by Marcin Cieślak
Catch more decoding issues