scrutinizer fixes from scrutinizer-ci

https://scrutinizer-ci.com/g/joshuataylor/commerce/inspections/75a2d2a7-4dc2-4f24-a1a7-55e572d13f6b/patches