#303: fix scary syntax per code review