Support for preserving label text. Also got rid of stupid verbose inline convention in this file.
Merge branch 'issue-47' into develop