Merge PrimOp0/PrimOp1 to Op and merge PrimApp0/PrimApp1 to App.
Merge PrimOp2 into Op.
Merge PrimOp3 into Op.
Merge ForeignImport into Op.
Merge TupN into Op.
Merge pull request #106 from pjonsson/format-fixes

Merge PrimOpN and PrimAppN into Op and App.