Avoid a large block by tweaking the condition skipping empty drives and
split up the switch containing two branches having different purpose.