Small tweaks just to stop code checker in PyDev worrying.