Code syntax cleanup, no functional changes.