Another multi-ccap build fix.