Kowtow to pylint's over-fussy 'too-many-return-statements'.

Incorporates feedback from @dhermes.