Fixed: DRY-er who_id retrieval