Style/syntax fixes to appease HoundCI. (again!)