Make one-liner function definitions bash-compatible
Eliminate remaining errors when loading in bash