Law of demeter violations? Will fix as part of refactoring...