Better workaround for cfx module dep validator