More cleanup for the implementation section.