Support thor 0.16.0 and 0.17.0+.