Pab/devel

Random type related stuff:
- Some cleanup of exceptions, fixes #42. 
- Keep track of conditionals within 'and' expressions
- Remove a bunch of pretends from algebra.  There are more of these, but have to start somewhere.