Style tweaks and use cross-platform file name construction.