CHECKPOINT: More compiler work