Implement the expand-id API.

Good point, fixed.