enhance WIEN2k for recent versions + cleanup

This builds on top of #479 by @MichaelSluydts