Cleanup : constant, deduplication

I have this in my tree for a while.

As you want to get rid of back-buffer (which is a good thing if it make things easier), it is probably the good time for me to propose it.