Changes based on PR#1233 feedback.