Misc. Hardware cleanups

This is some minor cleanups and organizational things in preparation for larger changes we might make in addressing https://github.com/mxcl/homebrew/issues/21778