Try to be more Godoc-friendly