[#523] More cleanups.