Fix performance-destroying bug.
Some minor workspace brilliance.