Fix #1435 by cleaning up our code a bit

Fixes #1435 

Reminder: We aren't removing "foobar" because we use it just _everywhere_ :)