Various refactors have left hanging variables, often in debug messages, hence
why they haven't been spotted. Fix them (pylint spotted the issues).
(Bitbake rev: e1f252408982a62485bbf874a01fd30a02aeed32)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>