clean up library inlining code from desugar, add Option built in type