[PVP] Always include procedures. Less problems and not much overhead.