Small .hpp cleanup.