Fix UMAC for good.

Hopefully, this really closed #20.