unify empty return statements

use simple `return;` instead of `return undef;`

closes #617