Cleanups suggested by Russell.