Bump (major) Nippy dependency (2.0.0-alpha7)
Update TODOs