Flatten out quadrature loop (again)

as indicated by Steffens latest stuff.