Some cleanups for last commit.