Ensure the use of parameterized classes

This patch enforces the use of parameterized classes and encoding data
in your manifests.