minor clean-ups from PR #53