* Address @ekiwi comments from review * Change match cases to scalafmt-mandated lined-up style (cherry picked from commit 872b282f)