Better givenCommand and params splitting.

This requires changes for modules.