Now with zero-argument call handling