Allow noop-adding of None objects.
Reimplemented the SP output formatters to hopefully work better and faster.
Improved indentation a bit.
Improved indentation a bit further.