Code cleanup changes from Elvis.