Clean up config.mk a bit