Tweak/improve on last commit as per @mislav's suggestions