Simplification streamable commands

[srgg]

Please ensure the following is present in your PR:

• [x] Unit tests for your change
• [x] Integration tests (if applicable)

Pull requests that are small and limited in scope are most welcome.

[alexmoore]

+1