The enhancement could include:

1. When keystore is password-less, do not prompt or complain about missing -storepass.

2. When keystore is password-less and -storepass is provided, consider a warning on it being useless.

3. For password-less keystore, allow storepass and keypass be different. For example, allowing providing -keypass without -storepass, etc.

A keystore is password-less if:

1. It exists and is password-less

2. It does not exist but will be created password-less