Build fix after r122115 and some cleanups.