Make conditional module and poll modules a little easier to understand