Switched behaviour mgmt from macros to vanilla fns.
Switched behaviour mgmt from macros to vanilla fns.

deas/lambdalf,lambdalf/lambdalf,lambdalf/lambdalf,jiangts/lambdalf,deas/lambdalf,jiangts/lambdalf