Also removed a fair amount of implicit inline methods to promote use
of more forward declaration.

Change-Id: I5ad21f0d7abc85281708b7e87f1036b02a053627