count: Convert to new-style argument parsing