Thanks to Jason and Gregory for explaining good practices, i'll take
care of these in the future.

And thanks to Johannes, for asking me to write this patch in the first
place :D