Imlement #1125 "FB: Simplify list of built-in data types"