Removing numbers from stream modes, where they make no difference. Closes #21