Add stdlib dependency; clean up