keep_simple_control_block_one_line and keep_simple_function_one_line override what's already in the code

[swajj]

The names and descriptions of these ("Allow format simple function to one line...") imply that this setting will, if true, leave one-line functions and control blocks alone if already present in the code.

Instead, these options forceably change my one-statement blocks into single-line blocks.

I want the option to work as worded- If there is a single-line block, leave it alone ("allow" it) but do NOT reformat things to be one-line for me, please.

I'd also be fine if this was a tristate option- true, false, or "leave alone". But as it is, there's no way to use this formatter without letting it completely override all my custom choices for single- vs multi-line formatting.