pom cleanup
Use generics for Mojo
merge roberts changes the easier way, given I'd forgotten to push