Effects: 

Some cleanup and tidying to prepare for adding the HProp. 

Lots of crosscutting changes, so want to merge sooner rather than later.