Wrong again. Those TODOs were to be removed along with their overrides, so that the pickups would spawn anywhere in the block; *but* only *after* the pickup physics were fixed enough to avoid FS 338.