Code cleanup for variable assignment definitions.

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