fix #672 better contextual completion for certain syntactic constructs