[shopkeep_local_scan] More Lint fixes