Fix eastwood warnings
Reogranize completion API, deprecate surplus arities in c.c/completions
Update tests to not trigger deprecation warnings