... and simplify the living hell out of callers
Signed-off-by: NAl Viro <viro@zeniv.linux.org.uk>