Fix IDE auto-import entries. (rebase)

Codebase should build and run as before; this is trivial code improvement.

Rebased from #1107.