It sounds like the Go compiler is better after this effort - fewer Plan 9 special cases in the code.