Changes for better Go hacking.