Code cleanup (3).