Fixes one bug, exposes lots of others.