Merged chapel-lang/master - one more follow-up