code style --- no really

Matt, you are absolutely right. We had agreed on `scalar` and `time`. I've forgotten about that. As well, those additional empty lines were _Astyle_'s `--break-blocks` option. I've skipped that now. Also, `auto_build_tuple` is now only CamelCased without trailing `T`.