Avoid deprecated FileBody constructors and clear up reflection warning.
Merge branch 'pr/236'
Fix some 80-character+ lines