Extra annotations for build.py as well