Changed to only use L_max histories if needed.

This *breaks* the RIP. So, again, this must not be correct.