More magic number elimination