More work on the texture refactor.