Re: [hackers] [slock] Fix my previous commit and some light refactoring

[Quentin Rameau]

> Heyho Quentin,
Yo Markus,

> After some reconsidering, I merged the patch as you proposed it. The
> other three are merged as well. Thanks for the contribution.
Thanks!