Make code compilant with suggestions

Okay, this way we could avoid the 'weird implications' @orium mentions.

This way we actually have the same functionality from before (in other words the current functionality doesn't manage '.' nor '=' "nicks") and we actually get the job done.