Italics on terms for readability.
Rename constraints for better readability.
Fix bug with bizarre behavior in javac regarding missing types.