Redo half-arsed hacks to do with BSS symbols on ELF. Hopefully get it right this time. MERGE TO STABLE