Unfortunately, this code is all in non-idiomatic style ... all of it, so best to just match what's there for now.