Hide secret implementation getter/setter better.
Too many versions in too many places.