Refactor to use 4.4 style pseudoconstant