A few more tricks to clean up and close #12