Use simplified @Grab where possible