Pop last argument iff it's a function.
Updated commands list.