ivars + magic numbers
Merge commit 'f7d7e5a8d246f90ad51b34b70254cac2eabad617'