Simplify a bit of completion code