Cleanup 'script api' move when conditions to includes file by convention, since when conditions really can be re-used.