start to break down enormous function
move another if tail from distance
remove another layer of nesting, coincidentally increasing PEP8-compliance
shortcut out another nested control structure
Merge branch 'master' into 429-config-task-presenters
Merge commit 'beb7' into culttag-redux