[Completion] Further method completion improvements