I ended up going this route, yes. I dunno, I like keeping them nested just for simplicity's sake; keeping the varB arguments together helps a bit with sanity checks.

But yeah, I'd forgotten the most basic of logic design elements, and things like that are only slightly more annoying than forgetting something like a semicolon -_-