Fixing more suggestions from pull-request feedback