Trying to remove all non-go-block blocking.  Introduced some cool macros.