ContextRework: FIXING RECENTLY-INTRODUCED REGRESSION
ContextRework: MISC TWEAKS…