Some cleaning up and adding support for both Simple16 and Simple9 (for the NewPFD and OptPFD schemes).