Cleaned up and pushed, but there were cases where comment said "Compiler class", but code was `moduleclass = 'lib'`.  Please review.