Issue 6940: Be a bit more restrictive with selector completions

https://code.google.com/p/fbug/issues/detail?id=6940
Update tests after issue 6940