Just use a string, and removed inline from the protected methods -
should be private if we want to inline them.

Change-Id: I72b03b417e009862574e5ef27506dec64f73455f