tweaks: reshuffle some code to harmonize two related functions
1 file changed