A few last bits of cleaning before merge.