These implementations need a cleanup pass in general (beyond missing pht(), this is bad too, e.g.), but I want to push through to running them as authoritative before mucking with them more than necessary.