Updated for Beta 5

Mostly related to @autoclosure and array addition.