Some const hax / API updates.