Issue116 pedantic

Starting to work on #116. This fixes a couple of error messages, all of them due to annotations.