Issue 20040: Pulled more line common functionality into Mixins