Solves remaining problems with #3516274.