I agree that it would be a lot of work to copy all those changes over to CB-Emu. To be honest, I only have MAME's evolution on my mind when doing driver updates. There is no 'oh, I should make it easy for Franz to copy it'. But, at the other end, there is no 'I should make it difficult for Franz to copy' either.