Fix further cases where plain literal was being used, or datatype was
being used in preference to language