use "var" and "val" literals, fix layout constraints for infix expressions