Further bootstrapification

As usual, branch name is now fairly unrelated
Setup probably won't like, but setup needs bootstrapping anyways.