A couple minor tweaks based upon Craig's feedback.