Refs #3289: Second pass of refactoring for Solaris compatibility (Initial promises/Techniques sync)