Fix use of old context-based constructor.

Fix use of old context-based constructor. #650