Minor cleanup to various classes.