Prepare for 1.7 loss of "Magic Values", class organization