final inline cleanup for external references
final inline cleanup for external references

Summary:Clean up in the face of external references though I changed few things that seemed more "appropriate" or "standard".
This is good to go with or without jarpath.

Reviewed By: bertmaher

Differential Revision: D3113595

fb-gh-sync-id: 171e6e647d6abda8cc4af5c5e5191241b3d6e365
fbshipit-source-id: 171e6e647d6abda8cc4af5c5e5191241b3d6e365

facebook/redex,facebook/redex,facebook/redex,facebook/redex,facebook/redex,facebook/redex,facebook/redex,facebook/redex,facebook/redex