re-add return statements in functions returning non-void. JF: my compiler wants this (and he's right)