Some post Wex-discussion cleanup