Converted more of the prelude to simpler types