More cleanup related to @789207d