While not a complete feature, as it does not handle overloads,
it is still an improvement on the current functionality. Would be
a good interim measure until full functionality arrives.

Change-Id: I947adc6a6dbccf676112ac77e186134fb660efd3
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>