Do a cleanup pass on machine registration #1198
Description
Have statically accessible machine definitions. Move stuff to datagen package where applicable.
{{ message }}
Have statically accessible machine definitions. Move stuff to datagen package where applicable.