Refining handler processing to avoid using eval as much as possible.