Remove mention of None from starlark code

[phil-davis]

because it causes trouble when running the starlark code directly on the drone server, and actually the refactoring looks better anyway.