Fix issue #19

The normal form expressions had too many conversion methods. Now they
are consolidated into just expr2nfexpr and nfexpr2expr.