This is part of the run-up to removing all TMAP code in the Jewel+1 cycle. Signed-off-by: John Spray <john.spray@redhat.com>