Polish 036596ee, inparticular restore the possibility of a compile-time constant estimate for the minus-operation.