Simplify command checks to remove redundant function calls.
Add 'r' option for reload.