More mucking about with how to handle units