Apply the suggested changes from jreidinger.