Issue #120: using new 'autosplit' feature to simplify things