Drop some dummy.c files, add some missing groupings and make sure all specifics are included in the generated output.