Use new rational-value format
Don't consume trailing colon with no following option
Add stuff