Manual fixes for style E501, etc. errors in orm package