Added basic macro handling to eval form