Fix a few issues.

Fixes #5011 and #5002 .
The name of the method is now misleading, as it is not pluralising anything. Perhaps change the method name or how it is called from bake?