Repeat counts now work, but a rethink about parsing is required.