Don't put an else after a return.
Refactor a find to maybe be less confusing to bcc.
Merge topic 'tll-includes-defines' into next

0c23e60 Refactor a find to maybe be less confusing to bcc.
da026cd Don't put an else after a return.