WIP on value expansion.