Pab/devel

type related stuff:
Track conditions through 'and' expressions
Embedding within 'except' - fixes bug #42