Check errors explicitly; don't rely on assert().

I decided to split them up by topic to make it simple and since your response time is so quick.

I think I got the indentation right this time ... 4-space indent, no tabs.

I went with "just past the open-paren" for multi-line function call indenting, but I'd be happy to change to whatever you prefer.

I tested to be sure that it compiled, but haven't tested at runtime (but I did test the previous version before the whitespace changes).