Refactored convenient syntax for .next, fixes #1