More cleaning introspectable code; tests all compile

Signed-off-by: W. Michael Petullo <mike@flyn.org>