Cleanup option keyword/environment substitution