Move goto-char nearer to where it's actually needed