Converts any complicated conditional dispatch situation into familiar static hash-key based dispatch

Changes for 0.95

• POD updates
• no functional changes