reduce indentation level
concatenate a few lines
add a mention to #4005 in a comment
make a table static const
change style: ( bla ) -> (bla)