Aside from g-t-e which requires some more logic change I'll do in the morning, this should be everything. Signed-off-by: Adam Williamson <awilliam@redhat.com>