Various supporting changes to the fay-base Prelude