Most constraints done, though some don't work yet
Removed desugaring and added NaBL constraint by type, as proposed by @guwac in #2