Bug 833385 - Implment an Id getter to simplify lookup.

Simplification suggestion from bz in review comments.