Tiny cleanups

scan call is easier to understand in RecurrentLayerWithSearch