Handle "any" application better

Fixes #18