Check more clause presence/absence appropriately
plot/typed fix to get demo working
Fix non-expected case with inits/fields missing annotations

Also fix bogus test cases and the bug that hid them