More work towards 1.0.

Still having problems with the homebrew::tap productions.