Fixes for "nicer syntax" + tests for typecheck