Nits pre-rework.