Oof. Yet more CPK conflicts...