tighten const types slightly