Code cleanup patches.