Cleanup for pushing/handling variable values.

Signed-off-by: Yorick Peterse <yorickpeterse@gmail.com>