Fix bug from removal of firstContext

First (minor) step in better context management.