CSP1150 A1: reorganised controller constructor args