#KJ-44 Move KLabel declarations close to their implementation rules. Corrected a bug in previous commit.
# KJ-45 Investigate failing tests on Jenkins. Fixed. Caused by an error in the implementation of #KJ-40