Mechanical code cleanup (sal-common-impl)