Updates based on @jeffhandley's feedback.