b39d972 more refactoring (fewer options and unwraps)

Authored and Committed by decathorpe 3 years ago
    more refactoring (fewer options and unwraps)
    
        
file modified
+4 -7
file modified
+2 -2
file modified
+23 -24
file modified
+27 -25
file modified
+4 -4