Fixed use of bare constants per BuFran's comments