Further conversion to the new prelude