Experimental switch over to searchspaces.

@jaberg suggested we try this out.

As far as I can tell, all the tests pass, but that evidence is somewhat shaky as they run for a hell of a long time on my laptop.