These are pretty basic, but get us roughly up to the level of the official completions (that are also incomplete and offer disabled options). Fixes #10858
