And make some methods non-inline, to unclutter the header.

Change-Id: I748a4cf8f8d5acef8f7583f8faf6834a3bec536c