No significant changes; put some hints where mypy got confused. Co-Authored-By: Miro Tomaska <mtomaska@redhat.com> Change-Id: I285d7bfffd9349467b24d8f078847d77a5b47cbe