Minor modularity change.