Cleanup: added missing annotations, removed unnecesary annotations

plus fixed a few unnecessary casts I missed last time.