r693: Make static