Added handling for manual, condition-less contexts.