More cleanup related to #13