Border incremental generator simplification