gcc: fix up broken chunks of the 4.4.3+cs patch and clean it up a bit more