Add a pre-command callback & use generic to separate pipelines

To make sure not to execute an unexpended pipeline, use generics to
separate pre- and post- expansion pipelines
Add a pre-command callback