Move jpeg private stuff out