Now uses string id references.

This can be used to identify a few more variables.