Support non-preferred versions
Go style tweaks