Completed NFRP4 (fixes #58).