More cleanup related to 56ca92a78d