Merged the two sections that enumerated the builtin values into one, at the top level.