Delete some of the old, now-unused needle machinery.
Tighten up the environment() specs.