#1169: standardise CLI cycle points

This fixes #1169.

@hjoliver, please review.