Pull request amendments per @passy.