Fixed pushnew macro which was using WHEN before it was defined