Clean up text wrapping.
Change text wrapping specs to use new syntax.
Clean up system.
Change system specs to use new syntax.
Clean up system which command.
Change system which command specs.