Fix literal tracking bug, move towards abstract setup