const, minor nits