Shortcut for default behavior, and bonus

*I wanted to do separate PR for these, but they are quite interdependant, so here are they to merge as a whole or to cherry-pick.*

See the commit messages for description!

Thanks for the awesome piece of code :sparkles: