Add RequestValueResolver annotations.
Fix infinite type recursion.