Trim off some dupe code.