Assembly replacement cosmetics.
Remove unnecessary headers.
Fix typo.