More code refactoring.

- Updated 'next' command to use 'onlyInChannel' wrapper parameter
- Partial refactoring of next() and skip()