Combine "Service links" and "Service links for not-node pages" into a single block

It's a hassle to have to place two blocks that do exactly the same thing depending on weather the page is a node or not. I don't see any reason this can't be reduced into only one block, with a setting so people can opt-out of all non-node pages if they don't want service links on them.