Add non-brittle identifiers for module members

Addresses issue discussed in 0bfa788.