--ipa and --app aren't actually incompatible

--ipa needs --app to provide bundle id.

and some misc cleanup.