Simplify imagebuild-makefile generation a bit and do input validation.