Yes, the next PR needs to change most of these, so I wanted to do this as is now, so a smaller diff is produced later.