FIXMEs removed.
intercept methods changed to protected final