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

Changes for 1.05

• no functional changes
• POD updates only