Further monadization

Signed-off-by: Christoph Höger <christoph.hoeger@tu-berlin.de>