ENH: Slightly saner comp