We call `vtimer_remove(&timer);` needlessly if there was no timeout, but that shouldn't bother us too much.
I'm have another idea of to do #811, but I'll wait for the end of April release before updating my PR.