Use more constants 1.6.x

corresponds to issue #1514