Refactor pseudoconstants CRM-12464