Switch to templates, improve search for return values.
Switch to templates, improve search for return values.

operasoftware/dragonfly,operasoftware/dragonfly,operasoftware/dragonfly,operasoftware/dragonfly