parser: Fix file lookup
parser: cleanup