Use a consistent signature for buildImage()

The other functions allow options to be skipped if they're not in use. buildImage doesn't, until this patch is applied.