Fix constant scoping.