Replaced magic numbers with the new int consts.