Change return types so scrutinizer shuts up [ci skip]