Tidy up init_buildsystem a bit

Trying to work on init_buildsystem.
This makes it a bit easier.