This was odd, and only used by one file each so why do it?
So I decided to simplify it.