Partial convertion of primitive definitions to new prelude