Also do some cleanup to make handling of substatements nicer.

Change-Id: I78773fc81d9b0058fa97c5cef393cca34b7fd885
Reviewed-on: http://codereview.qt-project.org/4413


Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>