I added the return value to keep changes in semantic smaller, but you are right, it's better to be consistent.