Elegance is a matter of opinion, and I won't try to convince you in any direction.
At the same time, I regard the things that are separated into home?.g and bed.g and so forth, I regard those as elegant because they provide "logical categorization" for the commands that are involved in homing, or whatever.
To say it another way: homez.g is doing exactly what it is designed to do, by being separate from the rest of the configuration.
So... I said I wouldn't try to convince you... and hopefully I haven't... just stating how I see it.