[ticket/11] Further split up conditionals