We present a Modified-Nodal-Analysis-derived method for developing Wave Digital Filter (WDF) adaptors corresponding to complicated (non-series/parallel) topologies that may include multiport linear elements (e.g. controlled sources and transformers). A second method resolves noncomputable (non-tree-like) arrangements of series/parallel adaptors. As with the familiar 3-port series and parallel adaptors, one port of each derived adaptor may be rendered reflection-free, making it acceptable for inclusion in a standard WDF tree. With these techniques, the class of acceptable reference circuits for WDF modeling is greatly expanded. This is demonstrated by case studies on circuits which were previously intractable with WDF methods: the Bassman tone stack and Tube Screamer tone/volume stage.