Tidied up build config a bit.