Yet more =SECTION fixes, try not to rearrange elements when it is unnecessary