Small style fixes and a descriptive re-name for the SuperShady
contribution after internal review.