Make this build work even from fresh bzr branches. Also stop using {x,y} stuff which somehow magically doesn't work on my laptop.
