Cleaning up builtin ctor a bit
Made completions records.