SigFinder spec: refactor a bit