See #15. Improve Commands to use only the `filter` function.