Converted types to expressions; added support for optional types in function parameters.