Adding support for while expressions