Replace 'given' and 'when' (fix #36)