Refactor the PCLConversions a bit