Minor changes for consistency in substitution expressions