Add missing aliases; cleanup.