Trivial cleanups after Kirill's fixes.