More work on simplifying compatibility code