Some hardware/ENV cleanups

/cc @mistydemeo - I think I rearranged things in extend/ENV.rb correctly but I could use another set of eyes.