I'd consider using Guice to avoid lines like this (of course if we have time and will to do so), otherwise lgtm.