Prepare for 1.7 removal of "Magic Values"