julianstorer A bit more work on source-code utilities