Minor clean-ups and renamings.