Yes, I'd rather they made story with consistent lore rather than try to "subvert expectations" all the time. It did not work all that great in EW.