Java 7 compliance: remove references to 'Parameter'