Replace some before blocks with let statements