Fixing fixable scrutinizer-issues in ContractParser