Bringing recent pull request inline with SuT's internal coding standards.