Improve SerialVersionHelper a bit