Minor tidying (rebased onto develop)



This is the same as gh-432 but rebased onto develop.

----

Fixes a couple of comments made by JM on rebased PRs recently (#430 and #427 - I grepped for instances of I/F and couldn't find anymore in the OMERO docs).

Can be rebased to develop after merging.