Added local scoping in choose expressions