Smarter nick completion

Fixes multiple issues.