More modifications related to '-1'.