Simplifications.  Fixes #16