Revert "Remove some default variables that butcher code"

This reverts commit 7986553a0db70d9771133c4c6bc7a782e3fea9cf.
Everything is working again.