stats: Minor arguments logic tidyup