Improve iProduct substitutions.

This improves on the solution to Issue #3 on GitHub.