Further bootstrapification

As usual, branch name is now fairly unrelated