We were only avoiding float intrusions for BFCs, but FFCs and GFCs should also accommodate for any floats present. Work towards #4136.