Fixed some completion cases with extension methods.