Signed-off-by: NBart Van Assche <bvanassche@acm.org>
[ broken out and small cleanups by David Dillow ]
Signed-off-by: NDavid Dillow <dillowda@ornl.gov>