Avoid unnecessary save/restore

A few common properties should not require save/restore pairs.
Remove unnecessary comment