extend using and when* syntax forms

Signed-off-by: Jan Dvořák <mordae@anilinux.org>