Improve keep-array-indentation behavior

Still more work to be done here. Opened #445

Fixes #340
Closes #333