Sentinel checks

Ready to merge work on NullAnnotator and FindSentinels into master.