Fix <access> tags never being removed on prepare. Fixes #151