Removed macro forms (-ing) and their tests.

They just complicate the interface with no benefit.