Refined the way haiku.context happens