[wmf]

Apparently GCC is crimping Apple's style enough to justify a rewrite, although that may be due to licensing and lack of modularity more than ugly code.