More module extractions.