Refactor
Use latest gostrut/invalid. Resolves #2 (in a round about way)