Address simple review comments. Rename things; push unrooted calls as far down the stack as possible; whitespace; documentation.