Updated per pull-request feedback.