Mechanical code cleanup (sal-common-api)