Some cleanup of muon trigger isolation algorithm

Removed some obsolete options/code. Factored out some common bits of the code to reduce the duplication between different types of isolation.